From 76f99372ba945c8c17cf5ebae6bd931ade0077bc Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 3 Aug 2006 09:49:37 +0000 Subject: [PATCH] removed the "widget &&" part from "widget && GTK_IS_FOO (widget)" checks. 2006-08-03 Michael Natterer * gtk/gtkstyle.c: removed the "widget &&" part from "widget && GTK_IS_FOO (widget)" checks. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkstyle.c | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33115586c0..9b69b259a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-03 Michael Natterer + + * gtk/gtkstyle.c: removed the "widget &&" part from + "widget && GTK_IS_FOO (widget)" checks. + 2006-07-13 Michael Emmel * gdk/directfb/gdkwindow-directfb.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 33115586c0..9b69b259a1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-08-03 Michael Natterer + + * gtk/gtkstyle.c: removed the "widget &&" part from + "widget && GTK_IS_FOO (widget)" checks. + 2006-07-13 Michael Emmel * gdk/directfb/gdkwindow-directfb.c diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index f3c071d623..58f4d0ef9a 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -2458,7 +2458,7 @@ gtk_default_draw_shadow (GtkStyle *style, if (shadow_type == GTK_SHADOW_IN) { - if (detail && (strcmp (detail, "buttondefault") == 0)) + if (detail && strcmp (detail, "buttondefault") == 0) { sanitize_size (window, &width, &height); @@ -2473,7 +2473,7 @@ gtk_default_draw_shadow (GtkStyle *style, x, y, width, height); return; } - if (widget && GTK_IS_SPIN_BUTTON (widget) && + if (GTK_IS_SPIN_BUTTON (widget) && detail && strcmp (detail, "spinbutton") == 0) { draw_spinbutton_shadow (style, window, state_type, @@ -2711,7 +2711,7 @@ gtk_default_draw_shadow (GtkStyle *style, } if (shadow_type == GTK_SHADOW_IN && - widget && GTK_IS_SPIN_BUTTON (widget) && + GTK_IS_SPIN_BUTTON (widget) && detail && strcmp (detail, "entry") == 0) { if (get_direction (widget) == GTK_TEXT_DIR_LTR) @@ -3261,7 +3261,7 @@ gtk_default_draw_box (GtkStyle *style, sanitize_size (window, &width, &height); - if (widget && GTK_IS_SPIN_BUTTON (widget) && detail) + if (GTK_IS_SPIN_BUTTON (widget) && detail) { if (strcmp (detail, "spinbutton_up") == 0) { -- 2.30.2